From a4631c510c541014222f243b27479259c2befec7 Mon Sep 17 00:00:00 2001 From: Jimi Xenidis Date: Mon, 21 Aug 2006 10:04:37 -0400 Subject: [PATCH] [XEN][POWERPC] more -Wshadow issues with gcc4 Signed-off-by: Jimi Xenidis Signed-off-by: Hollis Blanchard --- xen/arch/powerpc/ofd_fixup.c | 4 ++-- xen/arch/powerpc/oftree.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/powerpc/ofd_fixup.c b/xen/arch/powerpc/ofd_fixup.c index 0da3387587..e23c2ccd9f 100644 --- a/xen/arch/powerpc/ofd_fixup.c +++ b/xen/arch/powerpc/ofd_fixup.c @@ -24,6 +24,7 @@ #include #include #include "of-devtree.h" +#include "oftree.h" #undef RTAS @@ -440,8 +441,7 @@ static ofdn_t ofd_xen_props(void *m, struct domain *d, start_info_t *si) } return n; } -extern int ofd_dom0_fixup( - struct domain *d, ulong oftree, start_info_t *si, ulong dst); + int ofd_dom0_fixup(struct domain *d, ulong mem, start_info_t *si, ulong eoload) { void *m; diff --git a/xen/arch/powerpc/oftree.h b/xen/arch/powerpc/oftree.h index 07fc3c0430..4a96ceb3d0 100644 --- a/xen/arch/powerpc/oftree.h +++ b/xen/arch/powerpc/oftree.h @@ -25,7 +25,7 @@ extern ulong oftree; extern ulong oftree_len; extern int ofd_dom0_fixup( - struct domain *d, ulong oftree, start_info_t *si, ulong dst); + struct domain *d, ulong mem, start_info_t *si, ulong dst); extern int firmware_image_start[0]; extern int firmware_image_size[0]; -- 2.30.2